bitkeeper revision 1.1159.224.6 (41f151cby-4agnF_MdJ_L_DQDJjYbw)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 21 Jan 2005 19:02:35 +0000 (19:02 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Fri, 21 Jan 2005 19:02:35 +0000 (19:02 +0000)
commitfd5453a7bea4bbc5258b7f984d9f0e6317f0ebc6
tree055fd29c5eab3bef31a02db9a4ba962d7798c79a
parent91e7a3c674aca2fbd04b6f92d913d94d252ed7e5
bitkeeper revision 1.1159.224.6 (41f151cby-4agnF_MdJ_L_DQDJjYbw)

another manual merge.
xen/arch/x86/domain.c
xen/arch/x86/memory.c
xen/common/domain.c
xen/common/schedule.c
xen/include/xen/domain.h